revert previous change, maintain ABI.

Tue Mar  1 13:53:56 2005  Manish Singh  <yosh@gimp.org>

        * gtk/xdgmime/xdgmime.[ch]: revert previous change, maintain ABI.

diff --git a/ChangeLog b/ChangeLog
index b97f3831af0f89e7ea583c3505446656f0f3905d..69b38b68ac5bd29477d80b93a6461133648b1b63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar  1 13:53:56 2005  Manish Singh  <yosh@gimp.org>
+
+       * gtk/xdgmime/xdgmime.[ch]: revert previous change, maintain ABI.
+
 2005-03-01  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenutoolbutton.c (button_state_changed_cb): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b97f3831af0f89e7ea583c3505446656f0f3905d..69b38b68ac5bd29477d80b93a6461133648b1b63 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Tue Mar  1 13:53:56 2005  Manish Singh  <yosh@gimp.org>
+
+       * gtk/xdgmime/xdgmime.[ch]: revert previous change, maintain ABI.
+
 2005-03-01  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenutoolbutton.c (button_state_changed_cb): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b97f3831af0f89e7ea583c3505446656f0f3905d..69b38b68ac5bd29477d80b93a6461133648b1b63 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Tue Mar  1 13:53:56 2005  Manish Singh  <yosh@gimp.org>
+
+       * gtk/xdgmime/xdgmime.[ch]: revert previous change, maintain ABI.
+
 2005-03-01  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkmenutoolbutton.c (button_state_changed_cb): 

diff --git a/gtk/xdgmime/xdgmime.c b/gtk/xdgmime/xdgmime.c
index a63791b2511f1fbda36d054474d592f656ccf963..46798aea33fd9ee00b5a895048b1d8d7d2c23a81 100644 (file)
--- a/gtk/xdgmime/xdgmime.c
+++ b/gtk/xdgmime/xdgmime.c
@@ -55,7 +55,7 @@ static XdgAliasList *alias_list = NULL;
 static XdgParentList *parent_list = NULL;
 static XdgDirTimeList *dir_time_list = NULL;
 static XdgCallbackList *callback_list = NULL;
-const char xdg_mime_type_unknown[] = "application/octet-stream";
+const char *xdg_mime_type_unknown = "application/octet-stream";
 
 
 enum

diff --git a/gtk/xdgmime/xdgmime.h b/gtk/xdgmime/xdgmime.h
index 4bd14ee38faa60d5762e3515a95cc95d4374884e..db69b1243f5aeb65cc96b3aaa9b9b39e619c4130 100644 (file)
--- a/gtk/xdgmime/xdgmime.h
+++ b/gtk/xdgmime/xdgmime.h
@@ -63,7 +63,7 @@ typedef void (*XdgMimeDestroy)  (void *user_data);
 #define xdg_mime_dump                         XDG_ENTRY(dump)
 #endif
 
-extern const char xdg_mime_type_unknown[];
+extern const char *xdg_mime_type_unknown;
 #define XDG_MIME_TYPE_UNKNOWN xdg_mime_type_unknown
 
 const char  *xdg_mime_get_mime_type_for_data       (const void *data,